Swapped handling of certification version