This problem was partly introduced in d7e90db7 Signed-off-by: Francois Marier <francois@catalyst.net.nz>