Simplified done.cg #819