fixed wonky dependency injection ordering