Fixing subject import tracking