Bugfix - NSUserDefaults