fix the hard-coded limit