fix issue with CPT table for generic type