Closes #635

#635