Better fix for the import problem, like in other fork.