fix for #380