Closes #462.