Fix for 5.3 compat