Fixing the order simulation mechanism