Fixed a bug with the new offset