issue return screen fix