Fix for an Issue #511