we will clean this when refactoring the current header hack