Fix broken logic when wraping encoded data into rows, also simplifies it a bit
2 files changed