fix of serialization problems