Bug fix #380