fixed order bug on other places