Fix issue with addresses offset