replace all code like #22 before fixed