1.3 fix bugs