gaudi/Gaudi!501 (merged) exposed the same problem of !782 (merged), but in AlgTools.
This MR should fix the problem.