Closes #449