diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 68f9be0..c75fc1d 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -84,7 +84,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         parcel = Parcel.obtain();
         parcel.unmarshall(serializableBytes, 0, serializableBytes.length);
         parcel.setDataPosition(0);
-        final T result = parcel.readParcelable(parcelable.getClass().getClassLoader());
+        final T result = parcel.readParcelable(Thread.currentThread().getContextClassLoader());
         parcel.recycle();
         return result;
     }
@@ -331,10 +331,10 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
     }
 
     private static class ActivityResult {
-        final int requestCode;
-        final int resultCode;
+        public final int requestCode;
+        public final int resultCode;
         @Nullable
-        final Intent data;
+        public final Intent data;
 
         ActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
             this.requestCode = requestCode;
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 7111d99..91af235 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -221,8 +221,8 @@ public class ViewController<
 
     /**
      * Returns a color state list associated with a particular resource ID.
-     * <p>
-     * Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
+     *
+     * <p>Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
      * color state list will be styled for the specified Context's theme.
      *
      * @param resId The desired resource identifier, as generated by the aapt