[*] Fixes headers issue