Fixes onStop/onStart