Fix architecture nightmare