Fix for "string contains null byte"