Fixing dependencies order