fixed serialization bug
fixed serialization bug - cleaning code
fixed serialization bug - cleaning code 2