Closes #698

#698