#195 Fixed offset issue