Fix delivering PID logic