Fixed inconsistent null terminator