This version passes R CMD check