architecture fix