fixing bugz