Fix a 5.4 incompatibility