fixed bugs in sdk 1.5.8