header builder . apollo bug fix