Changed to static injection, seems to be more reliable.