Fixing architecture detection