Fix deserialization on Windows#32

GrimMaple wants to merge 2 commits intoNetflix:masterNetflix/vectorflow:masterfrom

GrimMaple:masterGrimMaple/vectorflow:masterCopy head branch name to clipboard