Fix for #380