Fixing order submission bug