bugfix reverse order