[BUGFIX] Only apply limit if it is > 0