Closes #656.

#656