Closes #456