diff --git a/README.md b/README.md
index ee8f009..4dd4503 100644
--- a/README.md
+++ b/README.md
@@ -77,18 +77,18 @@ You component ``MyComponent`` will have two props, **navigator** and
 **topNavigator**. They will let you to push new components from right using
 the first one or open a modal pushing from the second one.
 
-### Navigation with ``NavigationWrapper``
+### Navigation with ``NavigatorWrapper``
 If you just want to use the navigation bar inside a navigator, use the
-``NavigationWrapper`` component:
+``NavigatorWrapper`` component:
 
 ```js
 import React from 'react-native'
-import { NavigationWrapper } from 'react-native-navigator-wrapper'
+import { NavigatorWrapper } from 'react-native-navigator-wrapper'
 
 class MyComponent extends React.Component {
   render () {
     return (
-      <NavigationWrapper
+      <NavigatorWrapper
         initialComponent={Component}
         title='Title'
       />
@@ -97,7 +97,7 @@ class MyComponent extends React.Component {
 }
 ```
 
-Every time you push a component that's inside the ``NavigationWrapper`` component
+Every time you push a component that's inside the ``NavigatorWrapper`` component
 you will have a **navigator** prop, just like the top navigation option before,
 that will let you to keep pushing components in the stack.
 
diff --git a/lib/RouteMapper.ios.js b/lib/RouteMapper.ios.js
index f2e3bde..99af71f 100644
--- a/lib/RouteMapper.ios.js
+++ b/lib/RouteMapper.ios.js
@@ -23,7 +23,7 @@ export function leftButtonRouteMapperGenerator (BackComponent, styles, tintColor
 export function rightButtonRouteMapperGenerator (RightComponent, topNavigator) {
   return {
     RightButton: (route, navigator, index, navState) => {
-      if (RightComponent && !route.rightElement) {
+      if (RightComponent && !route.rightElement && index === 0) {
         return <RightComponent navigator={navigator} topNavigator={topNavigator} />
       }
       if (route.rightElement) {
diff --git a/package.json b/package.json
index 740ecb9..1a52989 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigator-wrapper",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A React Native Navigator component wrapper that implements nested navigators for both push and modal transitions.",
   "main": "index.js",
   "scripts": {