Fix application of problem number offsets