fixed same bugs.