fix same bugs