Temp fix for WS accumulation bug.