Fix for an Issue #509