Closes #412