Forgot to remove hard-coded limit