Now it works for remote and local calls