Fix Settings bug