Fixed last error with instance wait