Simple pre-save to fix PID issue