Fix client "window"