fix injection bugs