Another core.window fix