Dirty bugfix. Settings merged