Fixes relocation of header issue