Fix settings - 2