Fixed persistency of the parameter mappings

As the commit message says