Fixed the issue related to settings