revise some code for 0.12.1