Optimizing/fixing orphan lot return