Closes #451