Fixed change screen logic, thanks Hoa