fixed order bugs