Import fix for case 12984