Fix multiple headers issue