Better offset handling.