Fix overall order bug