Injector: Fix inconsistent behavior