closes #396