diff --git a/app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java b/app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java
index 1a237d4..1b9dc9b 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java
@@ -10,9 +10,9 @@ public class MyCameraImpl {
     private static final String TAG = MyCameraImpl.class.getSimpleName();
     private static Camera mCamera;
     private static Camera.Parameters mParams;
-    private static Context mContext;
-    private static MarshmallowCamera mMarshmallowCamera;
     private static Bus mBus;
+    private Context mContext;
+    private MarshmallowCamera mMarshmallowCamera;
 
     private static boolean mIsFlashlightOn;
     private static boolean mIsMarshmallow;
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java
index 6307dc5..eb587f9 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java
@@ -30,7 +30,7 @@ public class MainActivity extends SimpleActivity {
     @BindView(R.id.stroboscope_bar) SeekBar mStroboscopeBar;
 
     private static Bus mBus;
-    private static MyCameraImpl mCameraImpl;
+    private MyCameraImpl mCameraImpl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {