Closes #744

#744