- fixed initial loading issue