WIP: removed removal of trailing two bytes