fixed final bug hopefully