Fix feature scope