diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index 3a6a7c1a..2c76d5c2 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -276,7 +276,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 					navigationView.getMenu().findItem(R.id.nav_administration).setVisible(false);
 				}
 
-				if(((BaseActivity) ctx).getAccount().requiresVersion("1.14.0")) {
+				if(getAccount().requiresVersion("1.14.0")) {
 					navigationView.getMenu().findItem(R.id.nav_my_issues).setVisible(true);
 				}
 			}
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
index 29fb7784..b04fe5c5 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
@@ -48,7 +48,7 @@ public class SettingsGeneralActivity extends BaseActivity {
 
 		homeScreenList = new ArrayList<>(Arrays.asList(appHomeDefaultScreen));
 
-		if(!((BaseActivity) ctx).getAccount().requiresVersion("1.14.0")) {
+		if(!getAccount().requiresVersion("1.14.0")) {
 			homeScreenList.remove(8);
 		}
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
index bd496b32..baf34222 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
@@ -17,7 +17,7 @@ import org.mian.gitnex.databinding.FragmentIssuesBinding;
 import org.mian.gitnex.viewmodels.IssuesViewModel;
 
 /**
- * Author M M Arif
+ * @author M M Arif
  */
 
 public class MyIssuesFragment extends Fragment {