Potential fix to control window bug