Fix for an Issue #433