Fix for an Issue #546