Fixing 0th table issue