diff --git a/FlowLayout/src/main/java/com/wefika/flowlayout/FlowLayout.java b/FlowLayout/src/main/java/com/wefika/flowlayout/FlowLayout.java
index 45c675e..2c3c37c 100644
--- a/FlowLayout/src/main/java/com/wefika/flowlayout/FlowLayout.java
+++ b/FlowLayout/src/main/java/com/wefika/flowlayout/FlowLayout.java
@@ -275,7 +275,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 				// if height is match_parent we need to remeasure child to line height
 				if(lp.height == LayoutParams.MATCH_PARENT) {
 					int childWidthMode = MeasureSpec.AT_MOST;
-					int childWidthSize = lineWidth;
+					int childWidthSize = width - (lp.leftMargin + lp.rightMargin + getPaddingLeft() + getPaddingRight());
 
 					if(lp.width == LayoutParams.MATCH_PARENT) {
 						childWidthMode = MeasureSpec.EXACTLY;