Detached header fix 2