[mr2998] Fix recent visibility problem.