Get rid of weird headers bug