Closes #663.

#663