fixed architecture issues