#387 making order xray also do not submit twice