[#1] Fixed Headers issue