Fix issue with just one request possible