Closes #463.

#463