Previous fix wasn't backwards compatible with versions older than 12.2. This fixes it. This fixes it.