Fixes re/set clobbering