Issue #408 - Adding limit