diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m
index 5c599ca3..a9206b52 100644
--- a/MVMCoreUI/BaseControllers/MFViewController.m
+++ b/MVMCoreUI/BaseControllers/MFViewController.m
@@ -343,9 +343,7 @@
 - (BOOL)isOverridingRightButton {
     NSDictionary *rightPanelLinkDict = [self.loadObject.pageJSON dict:@"rightPanelButtonLink"];
     if (rightPanelLinkDict) {
-        [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:rightPanelLinkDict
-                                                                additionalData:nil
-                                                                      delegateObject:[self delegateObject]];
+        [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:rightPanelLinkDict additionalData:nil delegateObject:[self delegateObject]];
         return YES;
     } else {
         return NO;
@@ -355,9 +353,7 @@
 - (BOOL)isOverridingLeftButton {
     NSDictionary *leftPanelLinkDict = [self.loadObject.pageJSON dict:@"leftPanelButtonLink"];
     if (leftPanelLinkDict) {
-        [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:leftPanelLinkDict
-                                                                additionalData:nil
-                                                                delegateObject:[self delegateObject]];
+        [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:leftPanelLinkDict additionalData:nil delegateObject:[self delegateObject]];
         return YES;
     } else {
         return NO;
diff --git a/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m b/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m
index 5845a06a..1d8481d6 100644
--- a/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m
+++ b/MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m
@@ -140,16 +140,16 @@
 }
 
 - (BOOL)isOverridingLeftButton {
-    if ([self.viewController isKindOfClass:MFViewController.class]) {
-        return [(MFViewController *)self.viewController isOverridingLeftButton];
+    if ([self.viewController respondsToSelector:@selector(isOverridingLeftButton)]) {
+        return [self.viewController performSelector:@selector(isOverridingLeftButton)];
     } else {
         return [super isOverridingLeftButton];
     }
 }
 
 - (BOOL)isOverridingRightButton {
-    if ([self.viewController isKindOfClass:MFViewController.class]) {
-        return [(MFViewController *)self.viewController isOverridingRightButton];
+    if ([self.viewController respondsToSelector:@selector(isOverridingRightButton)]) {
+        return [self.viewController performSelector:@selector(isOverridingRightButton)];
     } else {
         return [super isOverridingRightButton];
     }