Fix limit = 0 to mean no limit