Fix up import problem