Experimental fix for #119