Fix for an Issue #467