closes #397