Fix for an Issue #497