Fixes ambiguities in feature