Small architecture fix.