Fix for unexisting token when noreq is used