Fix for an Issue #543