Fix issue with saving params