Fixed #4202 - Existing architectures are lost while associating architecture