fixer some bug