Fix serialization bug #11 #46