Rel20 fix compilation error