Fix for new import mechanism