Now passes R CMD check