trying to fix code gen