--- a/src/animation.c	Mon Jan 06 21:45:00 2020 +0100
+++ b/src/animation.c	Tue Jan 07 20:22:22 2020 +0100
@@ -64,14 +64,16 @@
 	if (an->elapsed < an->delay)
 		return;
 
-	an->elapsed = 0;
-	an->column += 1;
-
-	if (an->column >= an->sprite->ncols) {
-		an->column = 0;
-
+	/* Increment column first */
+	if (++an->column >= an->sprite->ncols) {
+		/*
+		 * Increment row, if we reach the last row it means we are
+		 * at the last frame.
+		 */
 		if (++an->row >= an->sprite->nrows)
-			an->row = 0;
+			an->row = an->sprite->nrows;
+		else
+			an->column = 0;
 	}
 }