diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java
index dceb8656e..3e1755ce7 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java
@@ -39,8 +39,8 @@ public class Buff extends Actor {
 		
 		this.target = target;
 		target.add( this );
-		
-		return true;
+
+        return target.buffs().contains(this);
 	}
 	
 	public void detach() {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
index ad1a60248..168f5b4fd 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
@@ -80,14 +80,14 @@ public class Elemental extends Mob {
 				HP++;
 				sprite.emitter().burst( Speck.factory( Speck.HEALING ), 1 );
 			}
-		} else {
-			if (buff instanceof Frost) {
+		} else if (buff instanceof Frost) {
                 if (Level.water[this.pos])
                     damage( Random.NormalIntRange( HT / 2, HT ), buff );
                 else
 				    damage( Random.NormalIntRange( 1, HT * 2 / 3 ), buff );
-			}
-		}
+		} else {
+            super.add( buff );
+        }
 	}
 	
 	@Override