Closes #616.

#616