bugfix AGAIN: correct order does not work due to dependencies