Closes #716

#716