Fixed issue #380