Resolving alerts is slightly more robust