JobIndex fix