fix Bug!!!