hotfix adjustments