bugfix: don't use limit here