r16112: Added Volker's fix for extra odd byte at the end