#MLHR-669 Fix some serialization problem