Bug 1077124 - for gij part 2