a fix for issue #344

Change-Id: I2388b1d2f73ec49ee305d9f83ad175dd58135d9d