Closes #661.

#661