Fixes buggies