Component calculation hotfix.