Attempt at making 5.3 compat