Fix for #285