Fix screen clearing (#655)