fix bugs for 0.2