Closes #626.

#626