compatibility with 5.3 fix