Fixing recursion on imports.