Fix onStart()

Change-Id: Ic1ff2cdea34c09fcffefd3b81a871f519196f405