closes #387