Fix injection of struct fields