Removed hard-coded limit