Fixes wrong variable names introduced by null collection values serialization fix