Fixed offset issue
1.0.7