Fix Bug: Change finish points instanly