Bug fix.

Change-Id: I488bbb1fab9d66161eea350cb1a728019c6571a3