Shim to fix settings saving