Fix call table, credit @awood314