Btw I also added the null-byte strip change.