Fixed call table problem