fix bug with request loop prevention