Header bug fixed