fixed the order bug