Fixed broken order flow