fix dependancy order