Fixing way TableWalker works