change settings logic
fixes