Fixed last bug hopefully