fixed 5.2 compat