Fixed onStart issues