Fixed the import dependency problem for real.