finish, wait fix