CRAN fix