Preserve order: didn't (quite); fixed