Yet another setup refinement