Closes #681

#681