Closes #642

#642