Another screen test fix