Fixed data range issue