fixup 5.3 support