Fix problem with filling new tables