Closes #546

#546