Fix Y computation in data sampling