Fix table issue, bug #83 and #81