Merge "Fix crash in settings"