Fix sunwait end