Corrected Small bug with serialization