Trying to put back the dwarf callback