Added fix for loading address first time