Fix dependency scheme