fixing buggies