diff --git a/src/animation/Animation.js b/src/animation/Animation.js
index 4604a99a..90f456cf 100644
--- a/src/animation/Animation.js
+++ b/src/animation/Animation.js
@@ -223,7 +223,7 @@ Phaser.Animation.prototype = {
             {
                 if (this.looped)
                 {
-                    this._frameIndex = this._frameIndex - this._frames.length;
+                    this._frameIndex %= this._frames.length;
                     this.currentFrame = this._frameData.getFrame(this._frames[this._frameIndex]);
 
                     if (this.currentFrame)
@@ -401,4 +401,4 @@ Phaser.Animation.generateFrameNames = function (prefix, min, max, suffix, zeroPa
 
     return output;
 
-}
\ No newline at end of file
+}
diff --git a/src/particles/arcade/Emitter.js b/src/particles/arcade/Emitter.js
index d8d886f3..c3fb007c 100644
--- a/src/particles/arcade/Emitter.js
+++ b/src/particles/arcade/Emitter.js
@@ -358,7 +358,7 @@ Phaser.Particles.Arcade.Emitter.prototype.emitParticle = function () {
 
     if (this.width > 1 || this.height > 1)
     {
-    	particle.reset(this.emiteX - this.game.rnd.integerInRange(this.left, this.right), this.emiteY - this.game.rnd.integerInRange(this.top, this.bottom));
+    	particle.reset(this.game.rnd.integerInRange(this.left, this.right), this.game.rnd.integerInRange(this.top, this.bottom));
     }
     else
     {