Fix headers override support. For #1300