fixing bugs with settings call flow