closes #378