Refix 'r' command issues