More fix on arch detection