[005] fixed bugs