fix discovery & backward compatibility