Closes #618.

#618