closes #380