Couple of fixes to the offset method