Apply offset arithmetic fix