Trying to fix. Will work on it later

Change-Id: Ia9c0216a450358a0648c3ee9171f37665f5c32e6