fix #546