Fix factory injecting support