Possible fix

Change-Id: Ia288be3e950d98986f397c006bd0bf3f54fc8b90