fix imports (addresses #7176)