Closes #660.

#660.