[REF][fix] Add fix to import. TODO: Not work yet