Added onStop before onDestroy