fixed type serialization
Merge branch 'tmp'