fixes #546