Close issue #214, fix table 8.1 for all formats.