architecture bug fixed