Hmm, trying the same trick with the offset variable too, fix for #7038 now works.