Tweak to pass R CMD check