Architecture fix