Fixed original-order bug