Fix offset issue