Closes #697

#697