diff --git a/src/psmoveservice/Device/View/ServerTrackerView.cpp b/src/psmoveservice/Device/View/ServerTrackerView.cpp
index 93c29db5..ae1f8de6 100644
--- a/src/psmoveservice/Device/View/ServerTrackerView.cpp
+++ b/src/psmoveservice/Device/View/ServerTrackerView.cpp
@@ -381,8 +381,7 @@ class OpenCVBufferState
     {
         const cv::Mat videoBufferMat(frameHeight, frameWidth, CV_8UC3, const_cast<unsigned char *>(video_buffer));
 
-        // Copy and Flip image about the x-axis
-        cv::flip(videoBufferMat, *bgrBuffer, 1);
+		videoBufferMat.copyTo(*bgrBuffer);
 
         // Convert the video buffer to the HSV color space
 		if (bgr2hsv != nullptr)
diff --git a/src/psmoveservice/PSMoveTracker/PSEye/PSEyeVideoCapture.cpp b/src/psmoveservice/PSMoveTracker/PSEye/PSEyeVideoCapture.cpp
index 24bf53fe..b0b8cb06 100644
--- a/src/psmoveservice/PSMoveTracker/PSEye/PSEyeVideoCapture.cpp
+++ b/src/psmoveservice/PSMoveTracker/PSEye/PSEyeVideoCapture.cpp
@@ -405,6 +405,8 @@ class PSEYECaptureCAM_PS3EYE : public cv::IVideoCapture
                 
                 eye->setAutogain(false);
                 eye->setAutoWhiteBalance(false);
+
+				eye->setFlip(true, false);
                 
                 m_index = _index;
                 refreshDimensions();