Bugfix to table entries