Try to fix import problem from 4.0.1 to 4.2.2