Manual address fix