67486392 rad bug

@rpg777 I think this addresses the bug regarding headers, can you verify?  I will merge this in to three phase branch for you to test

@lefticus