lib/under_os/history.rb in under-os-1.2.1 vs lib/under_os/history.rb in under-os-1.3.0

@@ -13,10 +13,13 @@
   def root_page=(page)
     @_.initWithRootViewController(page._)
   end
 
   def current_page
-    @_.visibleViewController.wrapper
+    controller = @_.topViewController
+
+    controller.is_a?(UnderOs::Page::UIViewControllerWrap) ?
+      controller.wrapper : root_page
   end
 
   def push(page, animated=true)
     if pages.include?(page)
       pop_to(page)