Closes #664.

#664