Experimental fix for build