Fixed architecture problem?