Null termination again... Issue #2