Work around injection issue