Closes #632

#632