Fix for an Issue #577