another fix for optimo

Change-Id: Ib1a6d60ace59628f010e1d7fc595d55de777ee04