updated to maintain 5.3 compat