Fixed headers bug