discovery span fix