Fix handling of -R flag.
6 files changed