fixing same bugs