Closes #603

#603