Fix bug with screens