fix routing of call and set