Fixed the limit number issue