Fixed animation issue with multiple subsets