Fixed settings functionality issue