Fix for PID during stop issue