Fixing -r option