Fixed network marshalling bug