Fix straggling rename to current from selected