Beta 6 headerfouten eindelijk opgelost

Update: I just upgraded with the latest batch of 12 or so commits and the exact same problem has returned :upside_down_face: Well it was bliss whilst it lasted..