Fix 5.3 closure issue