fixed more injection issues