Closes #454.