Fix issues #65 - Fix deserialization method