Table issue fix