[BUGFIX] Changes in getOffset