Fixed issue with setDefault*Store()