Fixed dependency injection order.