Thanks Tomas. Fix duplicate variable entry if null byte is included