Fixed bug introduced by previous release.

This release fixes a serialization bug introduced by the previous release. A unit test for this bug has been added to avoid future regression.