Fixing dependencies chain