Fixing core.screen.