Fix chicken and egg import problem.