Experimental additional fix