Bug fix.

Change-Id: I929bb54f5bffe282043cb0de9230fb3390537b20