Closes #609

#609