Added additional settings check