Some weird order bug fixed