Changed order to resolve deps