fix the hack doesnt consider the header