Solves create order bug