Refix last r2 -d regression. Needs more testing