Another fix for R-devel, needs deps first