fix with revision setup + new -r options