Restore communication/computation overlap in Q-closed term