1312152308: fix the bugs