Trovato workaround