diff --git a/av1/common/warped_motion.h b/av1/common/warped_motion.h
index e10a279..f566cad 100644
--- a/av1/common/warped_motion.h
+++ b/av1/common/warped_motion.h
@@ -381,10 +381,10 @@
     int center = default_warp_params.wmmat[param];
 
     int input = in_params->wmmat[param] - center;
-    int divisor = in_distance << param_shift[param];
+    int divisor = in_distance * (1 << param_shift[param]);
     int output = (int)(((int64_t)input * out_distance + divisor / 2) / divisor);
-    output = clamp(output, param_min[param], param_max[param])
-             << param_shift[param];
+    output = clamp(output, param_min[param], param_max[param]) *
+             (1 << param_shift[param]);
 
     out_params->wmmat[param] = center + output;
   }