Fix issue with limit(7)