Fix bug in architecture