Fix for an Issue #461