Re #1256 Fixing the offset shift issue.