Re #1256 Refactoring offset.