Experimental fix to issue