workaround / fix error

Change-Id: Ifb12fa4af231aeca445b92eaa09b130eca89ef93