Correcting header implementation on /basic