Removed inconsistency when relying on isLast()