fix those headers