Fix for BufferedMockRequest