Quick fix in R/subset.R to deal with annual data class