Manual fix of import