BUG: Problem with offsets introduced in last commit