Added a check for an Issue #361