fixing caller discovery