implemented one fix in transitive-dependencies branch, but not really happy with it