closes #373