Fix for save button with PW v2.3.7