fixing multiples bugs