Fix for Issue #461