Closes #421