Fixed settings issue