Fix for an Issue #529