fixed #546