Issue #23306:enforce returning the same lots that were issued