- enhanced format patch to cover more archs