diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj
index 56a87356..6bfacbde 100644
--- a/projects/kiwano/kiwano.vcxproj
+++ b/projects/kiwano/kiwano.vcxproj
@@ -142,7 +142,7 @@
     <ClCompile Include="..\..\src\kiwano\2d\ShapeActor.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\GifSprite.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\LayerActor.cpp" />
-    <ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.h.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\Stage.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\TextActor.cpp" />
diff --git a/projects/kiwano/kiwano.vcxproj.filters b/projects/kiwano/kiwano.vcxproj.filters
index 5e622aef..a915dc60 100644
--- a/projects/kiwano/kiwano.vcxproj.filters
+++ b/projects/kiwano/kiwano.vcxproj.filters
@@ -641,7 +641,7 @@
     <ClCompile Include="..\..\src\kiwano\2d\animation\FrameSequence.cpp">
       <Filter>2d\animation</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.h.cpp">
+    <ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.cpp">
       <Filter>2d</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\kiwano\2d\transition\Transition.cpp">
diff --git a/src/kiwano/2d/SpriteFrame.h.cpp b/src/kiwano/2d/SpriteFrame.cpp
similarity index 96%
rename from src/kiwano/2d/SpriteFrame.h.cpp
rename to src/kiwano/2d/SpriteFrame.cpp
index 1fb6716c..0d1d37a7 100644
--- a/src/kiwano/2d/SpriteFrame.h.cpp
+++ b/src/kiwano/2d/SpriteFrame.cpp
@@ -126,10 +126,13 @@ Vector<SpriteFrame> SpriteFrame::Split(int cols, int rows, int max_num, float pa
             ++current_num;
 
             dtx += (width + padding_x);
+
+            if (max_num > 0 && current_num >= max_num)
+                break;
         }
         dty += (height + padding_y);
 
-        if (max_num > 0 && current_num == max_num)
+        if (max_num > 0 && current_num >= max_num)
             break;
     }
     return frames;