Fix headers bug