Some gaps were missed in the previous version. Instead just initialize
the whole table to -1 first and then fill what needs to be specified.