Capture order and fix original flaw to capture order