Fixed import loop