fix requests logic