infinite loop fix for injecting
Merge branch 'master' into testing