Bug fix.

Change-Id: I6e278a716161494c5b05dd56477359d8b91d65eb