fixing architecture