5.3 compatibility tweak