Fixed major serialization bug (I really need to implement a smoke test plan)...