#82 - fixes encoding so that it is only on the value