Fixed PID handling.