DAR-1286: Added window to variable