force order and fix bug