diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index ea785195e..35efa8774 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -84,8 +84,11 @@ static ZmFont font;
 std::mutex              jpeg_mutex;
 
 void Image::update_function_pointers() {
-  /* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements */
-  if ( pixels % 16 || pixels % 12 ) {
+  /* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements
+   * previous tests were %16 or %12 but that is incorrect.  Should just be %4
+   */
+
+  if (pixels %4) {
     // have to use non-loop unrolled functions
     delta8_rgb = &std_delta8_rgb;
     delta8_bgr = &std_delta8_bgr;
@@ -95,7 +98,7 @@ void Image::update_function_pointers() {
     delta8_abgr = &std_delta8_abgr;
     delta8_gray8 = &std_delta8_gray8;
     blend = &std_blend;
-    Warning("Using slow std functions");
+    Warning("Using slow std functions because pixels %d mod 4=%d", pixels, pixels%4);
   } else {
     // Use either sse or neon, or loop unrolled version
     delta8_rgb = fptr_delta8_rgb;
diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 7a281a29a..bf434448a 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -115,10 +115,11 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame
       <div>
         <p id="image">
 <?php
-if ( $imageData['hasAnalImage'] ) {
+if ($imageData['hasAnalImage']) {
   echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s" title="Click to display frame %s analysis">',
-    $Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ),
-    ( $show=='anal'?'without':'with' ),
+    $Event->Id(), $Frame->FrameId(), $scale,
+    ($show=='anal'?'capt':'anal'),
+    ($show=='anal'?'without':'with')
   );
 }
 ?>