broken attempt to fix queue exhaustion
Made 'headers' public