5.3 compat fix