Change how we handle the enconding suite - correction of 572ef9c8