universal direct imports fix improvement