Closes #685

#685