fix for Headers appear misplaced (#1578)