Fix onStart, onStop