Headers fix