Fix change between screens bug
Merge pull request #32 from rising-thunder/cilop

Fix change between screens bug