Proper fix for an Issue #757