Use the proper address on the dispatch