Corrected headers handling.