closes #389