Fix: architecture