diff --git a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java
index 0b80e4c..5ab5bd1 100755
--- a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java
+++ b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java
@@ -385,6 +385,8 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
         for (int i = mButtonsCount - 1; i >= 0; i--) {
             View child = getChildAt(i);
 
+            if(!(child instanceof FloatingActionButton)) continue;
+
             if (child == mImageToggle) continue;
 
             FloatingActionButton fab = (FloatingActionButton) child;
@@ -959,7 +961,7 @@ public int getMenuButtonColorRipple() {
     }
 
     public void addMenuButton(FloatingActionButton fab) {
-        addView(fab, mButtonsCount - 2);
+        addView(fab);
         mButtonsCount++;
         addLabel(fab);
     }