Fix PID issue