Improve calculation of indicator's offset