Fix for an Issue #305