Fix for an Issue #513