patch from marco for upgraded jobs pooling