Fixing comment set serialization problem