Fixed settings logic