Good point. Maybe should consider tweaking the order to handle that upfront