fixed bug when loading settings
Merge commit '69eab516c0a567ebc3d02f9bde3ae4e53f182a34'