fixed order bug