Fixing parameters serialization