fix bug handling limit when None
Merge pull request #583 from demaagdk/develop

fix bug handling limit when None