Fix for order not marked complete issue