Partial fix to the import dependency problem.