former workaround in encoder/decoder seem to be not needed any more