and matchign changes to byte-based decoder too