Fix null bytes