o Fix gateway selection problem. Closes 3595.