Same bug, more places.

Signed-off-by: Martin Stone <martin@d7415.co.uk>