Fix for #332

Not as fast as default behaviour, but still.