fixing bugs of collision with babyRepo