Fix WindowManager