Discovery fix