Fixed settings population issue