Fix transitive import issue