Closes #491.

#491