[#909] Fixed header issue