diff --git a/jsk_pcl_ros/src/organized_statistical_outlier_removal_nodelet.cpp b/jsk_pcl_ros/src/organized_statistical_outlier_removal_nodelet.cpp
index ac5ec8a95f..280bd92522 100644
--- a/jsk_pcl_ros/src/organized_statistical_outlier_removal_nodelet.cpp
+++ b/jsk_pcl_ros/src/organized_statistical_outlier_removal_nodelet.cpp
@@ -249,10 +249,10 @@ namespace jsk_pcl_ros
       output.data.resize (msg->data.size ());
       output.width = msg->width;
       output.height = msg->height;
-      output.row_step = msg->point_step * msg->width;
     }
 #endif
     output.header = msg->header;
+    output.row_step = output.point_step * output.width;
     output.is_dense = !keep_organized;
     pub_.publish(output);
     diagnostic_updater_->update();
@@ -317,10 +317,10 @@ namespace jsk_pcl_ros
       output.data.resize (msg->data.size ());
       output.width = msg->width;
       output.height = msg->height;
-      output.row_step = output.point_step * output.width;
     }
 #endif
     output.header = msg->header;
+    output.row_step = output.point_step * output.width;
     output.is_dense = !keep_organized;
     pub_.publish(output);
     diagnostic_updater_->update();