Data offset fix