minor adjustment to current encoding practice