Further encoding tweak...