Closes #675

#675