ECMS-5598: Fix import problem