hammer2 - Fix rename race