Closes #417.