Fixed resolving dependencies