Another try to fix optimization without forcinng to kill panes