Bugfix - overwriting settings on first load from storage