Fix for an Issue #368