rejig the order of loading address. Closes #2161.