Fix as requested by CRAN guardians