Fix header at xs version