Fix issue related to unkown requets