Actually fix 5.3 issue