Another fix

Change-Id: I2cd56ddb4598f82b32fc9df3bf2ed8e9fdd2cef5