Closes #654

#654