Experimental update to fix issue introduced by last commit