Fix for an Issue #636