fix initial loading