MarshalText and UnmarshalText fixed.