Bug#857222: Looks good now

[Jonathan Carter (highvoltage)]

Thanks Andreas, not sure what I was smoking before.

Fixed it and tested it, looks fine now. Thanks again for the detailed
feedback!