- Fix rare issues when resuming the app (probably memory related)
