Fix change to constructor injection