Fix change between screens bug