Removed contract-breaking infinite lists