Fix bug onResume & clean up