Closes #613

#613