Proddebuts fix work with new tables