Closes #628.

#628