Fixed SCAL-265 - PID parsing on Shell Based Infrastructures