davidgohel fix for CRAN