fixed lost code while merge chaos