PID Fix for various versions