Fix in architecture