Reverted table overflow fix