Fix when_build_dependency  (no unit tests yet...)