Closes #433