Fix last TODO in Injector - Adrien