CRAN compatability fix