fixes bug #380