jeroen Fix for CRAN