CRM-14887 further fix on table