fixed problem with id and headers