Fix table emission