fix for rename clobbering