Fix somthing, break something else. Luckily, I fixed that too.
Fixed clean window issues.