Fixes #431 - making the tables work