bugfix-phase1 finish