diff --git a/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m b/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
index d38b78c..ee960aa 100644
--- a/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
+++ b/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
@@ -177,7 +177,7 @@
                         }
                     }
                     
-                     if (self.navigationObject.viewController && (self.navigationObject.viewController != [[self.navigationObject.navigationController viewControllers] lastObject])) {
+                    if (self.navigationObject.viewController && (self.navigationObject.viewController != self.navigationObject.navigationController.topViewController)) {
                         [self.navigationObject.navigationController popToViewController:self.navigationObject.viewController animated:self.navigationObject.animated];
                     } else {
                         [self markAsFinished];