Dependency collision fix