Fixed Settings storage to be more accurate.