diff --git a/RBot/Scripts/ScriptSkills.cs b/RBot/Scripts/ScriptSkills.cs
index 45e6626..4a2ed2f 100644
--- a/RBot/Scripts/ScriptSkills.cs
+++ b/RBot/Scripts/ScriptSkills.cs
@@ -214,8 +214,11 @@ private void _Poll()
                             Bot.Player.UseSkill(skill);
                         break;
                     case SkillMode.Wait:
-                        Bot.Wait.ForTrue(() => Bot.Player.CanUseSkill(skill), SkillTimeout, SkillTimer);
-                        Bot.Player.UseSkill(skill);
+						if (skill != -1)
+						{
+							Bot.Wait.ForTrue(() => Bot.Player.CanUseSkill(skill), SkillTimeout, SkillTimer);
+							Bot.Player.UseSkill(skill); 
+						}
                         break;
                 }
             }
diff --git a/RBot/Skills/PatternSkillProvider.cs b/RBot/Skills/PatternSkillProvider.cs
index f8516fe..f9bf0a4 100644
--- a/RBot/Skills/PatternSkillProvider.cs
+++ b/RBot/Skills/PatternSkillProvider.cs
@@ -32,7 +32,7 @@ public int GetNextSkill(ScriptInterface bot, out SkillMode mode)
 
         public void OnTargetReset(ScriptInterface bot)
         {
-            if (ResetOnTarget)
+            if (ResetOnTarget && !bot.Player.HasTarget)
                 Root.Reset();
         }