GenOutput fix
