bug with null orders fixed