Apply same fix for saving settings