Moved settings access inside methods (bug 875150)