fixing.bugs