fixes #244

Not really, but maybe this will get the ticket closed automatically
when 1.4.5 is released
fix #270

I do not believe this change should go into the 1.4.4 branch, so the fix
is only for 1.4.5