Fix and perform better injection