diff --git a/lib/ProMotion/screen/screen_module.rb b/lib/ProMotion/screen/screen_module.rb
index 911f4c3..0846f39 100644
--- a/lib/ProMotion/screen/screen_module.rb
+++ b/lib/ProMotion/screen/screen_module.rb
@@ -16,8 +16,8 @@ module ProMotion
       add_nav_bar(args) if args[:nav_bar]
       add_nav_bar_buttons
       tab_bar_setup
-      try :screen_setup
       try :on_init
+      try :screen_setup
       PM.logger.deprecated "In #{self.class.to_s}, #on_create has been deprecated and removed. Use #screen_init instead." if respond_to?(:on_create)
     end
 
diff --git a/lib/ProMotion/table/cell/table_view_cell_module.rb b/lib/ProMotion/table/cell/table_view_cell_module.rb
index c1b113f..8032826 100644
--- a/lib/ProMotion/table/cell/table_view_cell_module.rb
+++ b/lib/ProMotion/table/cell/table_view_cell_module.rb
@@ -73,6 +73,9 @@ module ProMotion
       if data_cell[:accessory][:view] == :switch
         self.accessoryView = switch_view
       else
+        if data_cell[:accessory][:view].superview && data_cell[:accessory][:view].superview.is_a?(UITableViewCell)
+          data_cell[:accessory][:view].superview.accessoryView = nil # Fix for issue #586
+        end
         self.accessoryView = data_cell[:accessory][:view]
         self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
       end