fix bugs in 02