solve the messed up introduced by Bo Ma