workaround / fix error

Change-Id: I6d3d6ece68f30e846c73248d8bddc7e400b8e82c