Stabilize new encoding