Closes #472