Fix for an Issue #409