Fixed again incompatibility with 5.12. Hopefully this works now.