Fix crash when returning to the previous screen.
Merge pull request #1 from STAR-ZERO/fix-crash

Fix crash when returning to the previous screen.