Closes #453