Closes #621

#621