Fixed the 'Settings' issue