Workaround a older PEX bug on 1.6.4