Additional get_current_screen fix