Experimental fix for build error