Fixed an ordering problem in risk disaggregation
Merge pull request #1491 from gem/fix-risk-disagg

Fix risk disaggregation