Issue #546