Fixed #380