Bug fix with index in settings panel