fixed same bugs