fix feature envy