fixing code gen