fix bugs
Merge commit '383df0e27b22ef8b665b1a09bfbd0ba94dd8f307' into rock/git