Actually fix the 5.3 bug