Make verison more 6-y
Work around an apparent bug