Closes #684

#684