Fix for an Issue #532