Bugfixed architecture.