Repaired architecture error