Trying to fix core.window