Closes #644

#644