Hotfix: Make param saving relatively robust