Fixes invalid limit error

Change-Id: I3337530484d2f689cab4197d44240dfcda62fc77
Merge "Fixes invalid limit error"