Replace j2 with z to avoid race