offset issue fixed