Bug fix.

Change-Id: I6c4692df71dc7188c0a9caf0ca6c26b67b4e168f