Fixed bug in request queue, reimplement code later