Fix for an Issue #757