Fix at-least in case where :limit is null