Feature/bugfix #824

Bugfix for #824 and possibly others updateSettings - related issues