Fixing dependency ambiguity