Hotfix/settlements