Fixed local settings - part 2