Fix for an Issue #500