Fix for missing userDefaults