Potentially fixed screen issue