Fix for issue #461