Replicating table fix for all the samples