Fix bug in new "complete" if limit != null