Bug#0000 make sure compile OK

Change-Id: I5ce00bfb45b5bbbabc905248954f4914b1b4e2e7