Fixed onStop issue, called now from MainActivity