fixed bugz