fix compatibility with latest dep/situation