Hopefully fixed crashing when returning to app.