Fix for an Issue #356