One more improvement of the waiting for screen. #20