5.12 fixed bugs