Another patch to fix import problems