Fix #380