Fix PID tracking hopefully