fixint the build: dependency got lost during merge