Merge pull request #2574 from neilLasrado/fiscal-year-fix

get fiscal year fix