Fix list and table bug