Fix for an Issue #364