Fix for #461