Fix for an Issue #462