tighter header handling