Fix settings - 3