Fix settings
Merge
Fix