Should now work with R-devel