Fix for address ordering on first load.

Fixes #1592