Closes #389