Wrong window bounds bug-fix