closes #376