fix for Time Window OOM - (CEP-992)