fix some order bug