Closes #724

#724