Experimental fix for the reset fix for the reset fix