closes #546