spedygiorgio hotfixes suggested by CRAN