Fixed dependencies resolution