fix order bugs